From c1607c14d54aff0405431bfa44f2c175f4f27aeb Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 19 Apr 2013 15:50:38 -0400 Subject: [PATCH] broadway: Get rid of generic macros Use existing API instead. --- gdk/broadway/gdkprivate-broadway.h | 3 --- gdk/broadway/gdkwindow-broadway.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h index d2a2912013..acbd8a281f 100644 --- a/gdk/broadway/gdkprivate-broadway.h +++ b/gdk/broadway/gdkprivate-broadway.h @@ -203,9 +203,6 @@ void _gdk_broadway_window_resize_surface (GdkWindow *window); void _gdk_broadway_cursor_update_theme (GdkCursor *cursor); void _gdk_broadway_cursor_display_finalize (GdkDisplay *display); -#define GDK_SCREEN_DISPLAY(screen) (GDK_BROADWAY_SCREEN (screen)->display) -#define GDK_WINDOW_SCREEN(win) (GDK_WINDOW_IMPL_BROADWAY (((GdkWindow *)win)->impl)->screen) -#define GDK_WINDOW_DISPLAY(win) (GDK_BROADWAY_SCREEN (GDK_WINDOW_SCREEN (win))->display) #define GDK_WINDOW_IS_BROADWAY(win) (GDK_IS_WINDOW_IMPL_BROADWAY (((GdkWindow *)win)->impl)) #endif /* __GDK_PRIVATE_BROADWAY_H__ */ diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c index 7919d1c168..56909bd288 100644 --- a/gdk/broadway/gdkwindow-broadway.c +++ b/gdk/broadway/gdkwindow-broadway.c @@ -1379,7 +1379,7 @@ gdk_broadway_window_begin_resize_drag (GdkWindow *window, !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window)) return; - mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window), TRUE); + mv_resize = get_move_resize_data (gdk_window_get_display (window), TRUE); mv_resize->is_resize = TRUE; mv_resize->moveresize_button = button; -- 2.30.2